From: Axel Neumann <neumann@cgws.de>
Date: Sat, 17 Aug 2013 12:22:04 +0000 (+0200)
Subject: Merge branch 'master' into bmx6_testing
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=13f0c9deacfb85587857a3eccbe4ad2de39f74c1;p=feed%2Frouting.git

Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile
---

13f0c9deacfb85587857a3eccbe4ad2de39f74c1